Merge branch 'master' into twitter_is_optional_too

Conflicts:
Gemfile

Andrew Cantino 10 years ago
parent
commit
7cbd7e6ae3
2 changed files with 4 additions and 1 deletions
  1. 1 1
      Gemfile
  2. 3 0
      bin/threaded.rb

+ 1 - 1
Gemfile

@@ -16,9 +16,9 @@ gem 'mqtt'                        # MQTTAgent
16 16
 gem 'slack-notifier', '~> 0.5.0'  # SlackAgent
17 17
 
18 18
 # Twitter Agents
19
+gem 'twitter', '~> 5.8.0' # Must to be loaded before cantino-twitter-stream.
19 20
 gem 'cantino-twitter-stream', github: 'cantino/twitter-stream', branch: 'master'
20 21
 gem 'omniauth-twitter'
21
-gem 'twitter', '~> 5.8.0'
22 22
 
23 23
 # Optional Services.
24 24
 gem 'omniauth-37signals'          # BasecampAgent

+ 3 - 0
bin/threaded.rb

@@ -1,6 +1,9 @@
1 1
 require 'thread'
2 2
 require 'huginn_scheduler'
3 3
 
4
+STDOUT.sync = true
5
+STDERR.sync = true
6
+
4 7
 def stop
5 8
   puts 'Exiting...'
6 9
   @scheduler.stop